Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 14 Nov 2011 22:33:07 +0000 (14:33 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 14 Nov 2011 22:33:07 +0000 (14:33 -0800)

Trivial merge